Fixed some maps bugs