More nightly fixes