Fixes from code review

Review URL: https://chromiumcodereview.appspot.com//12084039