Tidy up a few RDM bits