More zach fixes