Try to streamline lockfile creation