Forgot to import queue, and a few fixes