Fine tune setup script