git stash: couple of type fix and improvements