Fixed up batch to work on all systems