fixes and more conversions