Changes for GCC 4.9