Add back some variables for debugging.
Use general purpose encrypted flag when using password.