fixes after rebase