fixes after rebase v2