CroutonSetup improvements