Coding Standards fixes