Updated for mono 3.8 build