Fixes for gcc 4.3.