Updates to meet comments from Chris and John 21 Mar 13

svn path=/sandbox/; revision=83520