Fix some style related issues found by cppcheck