[#1251] Fixes for coding standards test failures