Wrapping more signal-affected functions