Minor tweakage