A few fixes for the kernel build options.