Small fixes
Lots of small fixes