Changes for universal scheduler and bug fixes.