Tidy ups

See commit messages