More fixes from overnight update