Fixing gcc 4.4 build