Tweaks in PBX-related code