Add back in hash checks and support proper UTF-16 string conversion