Fixes for GCC compilers