fix: ssi/signal stuff from master