Fixed sleep and since issues