Fix: a number of misuse of value types.