Ironed out a few bugs in the Claim locking/unlocking, especially with
the database side.