pts-core: Couple small changes