Slight setup tweaks