Minor changes of pull 1281 V2

https://github.com/mono/mono/pull/1282 with the recommanded changes.