RE: [PATCH] [RFC] Modularized the fix scripts