Fixed encryption / checksum issues