Fix various nightly build issues.