Some fixes to work with xamarin studio