Fixing an issue with queue instantiation, and queue watching