Adaptions for new kernel commits