Working on some fixes to thread timer wake up scheduling