Fix signals for gift and image event