Changes for Mono build