Fixed various map interaction issues