Testing various edits taken from the Stock Kernel.