Fix signature count & needed count updating

Supports #240