ZD:168340

Making two very quick tweaks per a VSTF request.