Fix: bugs found during uts.
Fix: bugs found during uts.
BrianRickardMason/TheUltimateStrategy,BrianRickardMason/TheUltimateStrategy,BrianRickardMason/TheUltimateStrategy,BrianRickardMason/TheUltimateStrategy