Small tweaks based on client feedback