pts-core: Tweaks