Blackout Memphis: One more small one...

Patch to v1.20 Various bug fixes after the major update