Fix a few gcc 4.9.0 issues