More minor fixes for generic values.

Joshua