Additional changes for Mono build