fix some bugs for keybase/keybase#204