More changes to try to get mono working.