changes for mono 3.6.0