Compatibility fixes, retested with 28000 maps.