Cosmetic fixes which were missed before.