Fixed more issues with build on Mono