Fixes after Linux 3.10.5