Misc fixes / tidy up
Released 8.1.13
8.1.14