GCC-4.7+ Build Fix