Fixed errors with new kernel builds