Worked around some issues with other tools.