fix all settings

Change-Id: I052010a16e08f9889a069ebc011dc9c84c8523ca