Deavid: Improvements to prevent steam loss