Various kernel modifications