Minor tweaks for consistency