Addressing double-b64ing in encrypted export.
Minor fixes.