Incorporate changes from Zach's review #3573