Fixes for GCC