Fixed bugs to work with 0.5.7+1

BUG=

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