Updating to support Mono 3.8