Improvements to Conversions and maps