Fixed some conversion warnings