Standards fixes