Unfortunately that one's gonna be REAL tough to get rid of =P
And luckily the map thing is going to be an easy fix. Thanks for the report!