More Fixes to Linux 3.4.78