assorted fixes for GPG format ;(