Cleanup for GCC-4.x