Minor stuff

Only works on nightly