Remove use of UnsignedBytes.toInt()