Fixes BC bricking game and more

• Fixes game bricked when running BC !11987 (comment 395221) after !11987 (merged) (temporary until @franklygeorge finds a better solution).
• Corrects issue #5188