FIX: Batch scripts arguments with spaces fixed