Part of #3172 - slight changes to psc_labels