release-next: bug fixes and reset scare count