Finish some issues in data conversion