Add setup changes (missed from previous commit)