More fixes

More fixes :)