Fixing GCC linter errors