WIP field repairs