Fix signals and slots