Fix some warnings on recent gcc compilers.
Authored by: ulrikp 2018-06-10
Parent: [r1259]
Child: [r1261]