Tie up loose ends