PS Standards further fixes