fix compatibility issues with SF 2.5, SMW 1.9, MW 1.22

Change-Id: I7cf386c90a7786c0e37b1026c757b0f25fa01a30