Update for Sultan's new kernel, sync with my 3.4 mods