A couple more minor changes