Merge pull request #3251 from git-up/fixes

Fixes