Easy fixes based on Hari/Swarun's feedback.