A few last minute changes...