Adding Some Other tweaks from motley mostly to get kernel inline with current