Couple of more neat changes.