nightly fixes