Fixes after rebase.