Various fixes for dotfiles