Couple of wee tweaks