A couple of other improvements