Updates to deal with format issues on conversion