Fixes for gcc 4.7.2