pull in fixes for gcc-10 compilation