DEP3'ed some patches