More fixes

Because