A number of changes that allow the heuristic solver to work