Fixing reader reported bugs.

BUG=
R=kevmoo@google.com

Review URL: https://codereview.appspot.com/170420043