pts-core: Fix from today's earlier merges