fixes for GCC environment