Hotfix for cppcheck errors