PT Generator: few tweaks