Small tweaks based on feedback