First initial changes for Mono