Couple of minor updates to restore accuracy.

[originally from svn r6268]