Fix David and Alex's problems.