Fix for #3573

Fixes #3573 (https://github.com/OpenRA/OpenRA/issues/3573) and some other minor changes.