And a couple more minor changes