[2020] Map issues that really should be fixed #3

Thanks for these, passed them onto the team, and the previous ones were super helpful too!