Minor bugfix
Fixes
Minor tweek
Misc tweeks