More fixes for gcc 4.7 errors