Improved converters to make them compatible with Xamarin