Map clearing
Fix some errors.