Minor changes of pull 1281

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