ADS handling restored and extended, both Win and Linux