Queues: fix compilation errors, remove TODOs