fixes for zach