Fix up the kernel defconfigs and some random errors