Minor setup changes.