Release-readiness tweaks