Small code changes
Stash merge