[WiP] Consolidating Mono fixes from Don