More fixes to fixtures