ASQ fixes