fixing small things, still need to make the kernel build again