Fixes to work with nightly build.