Fix for gcc 4.8 compilation errors.