Fix some conversion issue.