Some Patch & Tools