some fixes for zcc