And more minor updates