fixes for Zach