TOOLS: Fix Filesystem management tools