scheduling Api fixes