One of them doesn't make sense without this pull request. I'll move that to a separate commit so that @JonnyJD can either merge everything or everything minus the --keyring/--no-keyring change.