Fixes after the rebase.