Corrections due to branching and new workspace path locally