Fixed more derps than I am comfortably to admit I made.

Now, that "tried to unlock unlocked spinlock" again...