Partial changes for PBS/EMW revisions