Fix errors in threadskv1 and threadskv3