More adjustments based on FernetMeta comments