Fixes for new style signals