Tidies up some small things.