one last tweak before demo
Misc bugfixes. [fixes #47319483] [fixes #47307515] [fixes #47308191] [fixes #47308111]