Update tools to work on Windows