K3.1 Crypsis fixes