Last minute updates for value semantics