fixes for clang 5.0
by Adam Boseley 20 Nov '17

20 Nov '17