Fixes after rebase