fix some on straglers

BUG=

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