Fixing the batch file wrapper