Small adjusts on Setup routines