Fix the conflicts from post-agm changes