Small tweaks to address