Fix issues for AS-1