Some wee tweaks