Missing some values.
More fixes.