more fixes for gpg format (issue #472)