Some debugging updates from when trying to fix a deadlock. Also, added the notication_needed=1 which seems to resolve the deadlock.