Sort out a few admin type bits ready for getting the code merged