Fix COVID showcase scenario
Fix supplemental O2 action getting removed too early
Fix a few logging bugs