Fixed some potentially recursive maps.