Various changes to make nightly builds possible.