more fixes for GCC