fixes for GCC