Dealing with vanilla kernel issues