Fixed errors in batch script, etc