Bugfixes to AsyncMap