Fix ADSView bugs