some fixes to make the kernel compile again