Some setup changes again