bug fixes for zf1