More fixes 2.