RE: Minor tweaks