Fix some issues with 2013 macro edits