Various last minute changes