Some more last minute changes