Old kernel wouldn't build, this should fix it

Now to re-apply my commits….