fixes for ad, map