Changes for Mono compatibility