Fix some map issues. BROKEN>