A couple of more changes