Issue fix queues

Closes #993