More fixes to wensleydale2