Small bug fixes and adjustments to get it ready do to push to the server. No new features.

BUG=skia:2930
TBR=jcgregorio

Review URL: https://codereview.chromium.org/715163004