More signal /slot fixes