[BUGFIX] Fix broken scheduler tasks