Minor changes of pull 1281

See https://github.com/mono/mono/pull/1281