Fix minor bugs in ASO.