Several CppCat warnings fixed

The bottom two - errors