Post rebase fixes