Fixes from some of the model-free v3.1 tag names.
Authored by: bugman 2011-01-31
Parent: [r123]
Child: [r125]
