More stuff
Fixes