Misc fixes
Merged with v9