Fixes for branch2