SIP: minor fixes