Fixes for CLANG reported errors

Mostly adding "return" statements after calls to fatal();
bug 403