[vbam/f24] Fix building with gcc6 / fix FTBFS