Bugfix and more graceful queue overflow mgmt