Small tweaks of setup files