Fix unapproved thread issues