Minor changes to Signal