More fixes

weeeeee