Corrections to help in ADS generation
Tweaks following ADS searches