Fixes for ControlValueHolderWithStorage