Changes to run smoke test on Mono