Setup tweaks