Minor changes whilst I track down why this isn't working on my iMac