Resolve stash issues