More Mono compatibility fixes.