Fixed implicit conversion warnings