A few more minor changes