Fixes for gcc 4.4