More minor tidies