Fix signal ordering upvalue bugs