Remove conversion warnings