minor fixes for issues 9515 and 9667

BUG=

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