Several CppCat warnings fixed
Merge pull request #2552 from KindDragon/master

Several CppCat warnings fixed