Fixed Map bugs.