kernel: fix some messy commits