Fix issues for dotfiles