Minor tweaks?