Merge pull request #179 from digawp/misc-fix
Misc fixes

(main@67b500c71be064b2a9a822ae327982ac9e03b56f)