Tidy some small issues.