Minor stuff

Please let this be the last commit before 2.3.0...