Fix some nightly stuff