corrections after rebase