Couple of small modifications.