Some changes ready for the SRV Nightmare.