minor fixes for gcc