Various tidy ups