Fix encryption stuff