Fix persistability of builder stages with no more required fields