Merge "SIP: misc fixes." into gingerbread