Fixes for GCC 4.8