more fixes for zcc