From Mono with fixes