Fix error integration, branch