More fixes from Vicky