Weird kernel fixes

Luca Weissrequested to merge
weird-kernel-fixes into master

Fix what's broken on bpo

Merge request reports