Further minor tidies