[K3.1] Crypsis: small improvements