Tidying up some loose ends.