Fix the issues in sweep tool.