Fix compile errors using gcc-4.7