Merge "SIP: minor fixes." into gingerbread