mcs-queue: a few changes