Fixes for gcc 4.6