More fixes

More fixes