A few git migration changes
sf bug 3 fixed