Even more Mono compatibility fixes.