Couple of minor bug fixes when using GPG, still missing key import.