Tweaks to events migration