Some Coding Standards fixes.