Tighten some loose ends