Corrections for CppCheck V1.63 support