Some setup changes.