more fixture fixes