Tidying up a few loose ends