Mono 3.6.1 / xbuild 12 compatibility tweaks