Fixing more signal errors