pts-core: Continued tweaks