pts-core: More improvements