This consists of fixing free threads