Fix rebase introduced errors