Some more setup changes