Fixes for gcc 4.8+