Fix bad fixtures and code that loops them