Pull in fixes from @naanlizard's fork

[dkerr64]

@naanlizard I noticed that you forked this repo and have made some fixes that improve stability. Can you advise whether you recommend that I pull these into my version?