Kernel 3.0 iyokan modifications/additions