More fixes for git branches