Fixed some conversion errors