Fixed mono/xamarin solution