Merge pull request #253 from TheBlueMatt/2018-11-misc-tweaks