Fix lockfile speed issues