Minor tweaking