Following #1bc7cd94f8740c7ff6bc1554e9ab740555f21a53
Fix bugs with new async maploader