Forwardport lockfile fixes