Fix issue with commits on multiple branches. Other changes