Fix lockfile speed issues (master)