Fix pointer population in events map.
Merge pull request #345 from johngian/fix-map-pointers

Fix pointer population in events map.