More fixes done.