Windows esp command fixes