more fixes for gcc 4.4