Various fixes.
Rollback bogus improvement.