Refs #100890  Fix 3 bugs found in testing
Refs #100890  Fix 3 bugs found in testing

Passes csrc/tests, but fails with a segfault in exttests.

svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx,svartika/ccnx