fixing some map init issues