Fixing warnings [ADS-1]