Fix misstakes after rebase