These changes makes scheduling with constantly sleeping threads bit
smoother in the future