More nits

From Jon Forrest, again.