fix for some nightly build failures