Fixes in setup batch script