A few fixes after last commit.