Backported enhancements in signature counts