Bug fixes in Clear Map