Fix Interface settings

Change-Id: I1737ca5f846380febb055f1d72581399ed353218