Minor tweaks from experimentation