Merge Dom's fixes to ChrisP's repo