additional fixes for making a kernel