Nightly commit, minor changes