Small changes to map events and a few other things