Fix errors after rebase

Fix errors after rebase