Minor fixes after rebase.