Fixed last minute changes