More multi-branch fixes