Fix some conversion warnings