Some stale bugs improvements.