More fixes

God save me
Fixes