A couple of fixes. gpg2's key generation does now work.