Minor fixes for newer GCC compilers