Fixes for kernel error