Mapper: Fix queues to read from and write on