Minor mods to the value defs