Kernel/other bug fixes [ci skip]