The attached patch, I believe, fixes all of the issues.

I pushed it. Thanks!



Reply via email to