Some changes to hopefully fix the done problem.