Minor tweaks for min-stream compliance