Fixing issues created by git pull