Union and Map bug fixes and improvements.