Signal fixes