Fixes Zach's errors