A few fixes.
More work.