Fix the implicit conversion warns