Fix timeouts on notifications not happening