More fixes.

Normality should be on errors, not time. However, not enough time to fix.