Compilation fixes for 3.16.x kernels