Lots of little fixes suggested by Xamarin Studio