A few more tidy ups.