KRACOEUS-6982: More Prop Dev initial save goodness

KRACOEUS-6982: Address issues raised in comments