more manual fixes w.r.t recrypt