more fixes on scheduled jobs