Minor fixes

I did more minor fixes this morning, more to come!

Can you please let me know somewhere (in the upstream PR maybe) what are the bugs you have found so I don't fix them if I find them too?  Thanks!