Some Fixes & Custom Scripts added with .diff / .patch