Minor last minute changes