m4 release fixes for problems found by tests

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