pts-core: Fixes