am b8fcf57f: Fix remaining small issues with the lock sampling.

Merge commit 'b8fcf57f13b4d37950cfbd72a6af401941d7bdd8' into kraken

* commit 'b8fcf57f13b4d37950cfbd72a6af401941d7bdd8':
  Fix remaining small issues with the lock sampling.