More fixes

God save me