Add some things to tidy up other things