fixes for gcc 4.7