Fixed up loose ends