avoid saving z cache, small fixes