Fixes

Hopefully it works now