Dave Bodenstab's fixes.

svn path=/trunk/; revision=855