Also, can we don something about this hard-coded checksum type?