Small fixes

I think we'd be hard pressed to compile with gcc 5.x.