Added small fixes for the converter