fixes for conversion