Fix delivery save and render