Fix rebase fallout