Fix unsigned/signed comparison
Explicit construction of named values map