Pull request for semi-significant fixes

I accidentally the queues