Fixed some conversion issues