more linux 3.4 fixes.