GCC-4.8+ Build Fix 

GCC-4.8+ Build Fix