Fixed up some queuing event handling