GCC compability fixes