Mono build fixes and minor corrections