Fix Figure reference errors made in merge.
Merge branch 'edits'