[AS/NY] Fix bugs