Further tweaks following PR feedback