Implicit conversion fixes