Made various changes for new Mono production environment.