zt: some fixes