Fix for conversions. Need to make those into clean utils and write unittests