minor tidyup of warnings