Fixes for gcc.