Couple quick tweaks for setting up