Fixes for 3.10 kernels