minor tidies for 0.6.0-rc's