compilation: More fixes for GCC-4.4