fix a couple loose ends