Couple of minor clean-ups.