Version 0.85c fixes around mono related problems