More fixes2