Legacy changes.
Small changes.