More fix prep