bugfixes for keybase/keybase#204