Small tweaks to prepare for end of sprint 2.