0.23.3 queue fixes and improvements