more fixes after rebase