Fix Schedule issues