Fixing git stash problems