Better alignment of encryption and initialize safely options