Various fixes. Locations should appear in events now.