Fix Windows command line wrapper