fixes for gcc