fixes for build with new compiler