Near-final tweaks for v0.35.0