Fixing up some more Fremantle issues