Fixes for GCC 4.9