Fixed some issues with the converter