pts-core: Various tweaks