More fixes

stuff