Fixes to ensure that the correct logic applies to the right map type