PS Standard additional fixes