Fixed all implicit conversion warnings