Some last adaptions
defconfig updates