Fix clang implicit conversion errors