Fix types, remove unused import _signal, fixing imports