some fixes in waitFor factory