Fixes per ET1_issues_dev Google doc