Code

Improve use of lockfile API