Misc fixes
Released 9.0.14
Misc fixes