I did this before, but it got lost in cyberspace. Rebase failure.
Fixed semaphores and whatnot.