Adjustments for 4.18 kernel