Fixes for gcc