Nightly update fixes