Minor tweaks!