Minor changes in Value handling