defconfig: some corrections

Change-Id: I202ef21923b2fcaacf01f37aca6e46063a8067ba