compilation: Final fixes for gcc-4.4