Minor setup changes