Couple of tweaks following testing.