more changes for GCC 4.8