I finally have a clean compile of the locking fixes for work.

Now, I can try to figure out what the changes broke. *sigh*