Fixup values - more to do