A couple from last Drew Changeset, still more to do.