Improved os..args detection