Fixed signals that weren't refactored properly.