Backport of some bugfixes to Ubuntu kernels