Changes for 4.9 GCC