Add path and defconfig changes