Fixes to signals