PS standards fixes