fixes for conversions