Merge pull request #115 from TheBlueMatt/2018-08-channel-fuzz-fixes