minor tidies from the field