Some fixes

Lots of