Make small improvements to Values