m8: add back some more crap from stock