Minor changes to Mercury tool.