More fixes for dotfiles