mono should not need these fixes anymore