fixes for 0.5.17

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