Some last minute changes