Several CppCat warnings fixed