Some wee changes