RHEL fix & minor tidies