several fixes sip