Changes to enable Linux 4.8 compilation