Tidying up a few ancillary things