Fixes for kernel compile w/ 4.8