misc fixes
Merged with v9