cryptsetup fixes