Fix Map issues and bugs