Corrected some conversion issues.