Fixes some bugs in embeded maps