Fix a few gcc 4.9.0 issues
Merge pull request #2322 from ktf/fix-490-take2

Gcc 4.9.0 -- Fix a few gcc 4.9.0 issues