Changes related to kernel 3.0.36