Add support for Winblows and clean up string substitutions