Fix compilation errors due to sig change

Change-Id: Ic05a84d4996adbcd18f590f95fefebcc38cf02b0