More fixes

lel