Tidying up loose ends.