Fixing Schedule issues