Compatibility fixes with existing game code