PS Standards fixes