Minor map interaction improvements