More fixes on schedule