Oh, and update on the lock fix... a number 36 drill will take out the two blind roll pins to allow the lock to come apart. That's also a tap drill for a 6-32 thread, so a 3/16" long setscrew can be installed in place of the pin to make the lock easily servicable.