Fix signal callbacks