Fixing up a few signal errors