Fixing Implicit conversion warnings