Small fixes after merging the pull request about keeping ssh keys