Some minor fixes and active and deactive signals