fixing ADA issues