Various tidy ups: