Updates to loose ends