fixes for 0.8.9

R=jmesserly@google.com

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