fixes to values-ms