Miscellaneous bug fixes

I realise that RDX10 is being worked on, but this will allow anyone who downloads a copy of the github repo to have a current fixed copy.