Changes to support kernel 3.16