Tweak the setup defaults