Small tweaks on setup data