Minor tweaks for v3-0-3