Fix some of kernel configs conflicts