Fixed Map Issues

XOXO