MOre stuff
Fixes