Fixed some problem with maps