Refine the release rules a bit