fixes for GCC.