Minor tweaks for conventions