Misc small fixes
Merged with master
Merged with v9