More fixes for queue stuff.