[DF-2911] Fixes in occlusion