More fixes for the same problem.