Minor tweaks to fragment